stylecontext: Remove GtkStylePropertyContext from pack funcs

diff --git a/gtk/gtkcssshorthandproperty.c b/gtk/gtkcssshorthandproperty.c
index 8258c001f4a051d88a127fa2892ff4ebd8535a68..d5a9005944dbfab42fa067aa1c95ec29e0488c5f 100644 (file)
--- a/gtk/gtkcssshorthandproperty.c
+++ b/gtk/gtkcssshorthandproperty.c
@@ -91,7 +91,7 @@ _gtk_css_shorthand_property_query (GtkStyleProperty   *property,
                                   GtkStylePropertyContext *context,
                                    GValue             *value)
 {
-  property->pack_func (value, props, state, context);
+  property->pack_func (value, props, state);
 }
 
 static gboolean

diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c
index 4afa2eee7c6526f81c5fa28d3c0dc2b5aac238a5..a977971ef20d4873484cadd1683383c2efd628aa 100644 (file)
--- a/gtk/gtkcssshorthandpropertyimpl.c
+++ b/gtk/gtkcssshorthandpropertyimpl.c
@@ -335,8 +335,7 @@ unpack_border_width (const GValue *value,
 static void
 pack_border_width (GValue             *value,
                    GtkStyleProperties *props,
-                   GtkStateFlags       state,
-                  GtkStylePropertyContext *context)
+                   GtkStateFlags       state)
 {
   pack_border (value, props, state,
                "border-top-width", "border-left-width",
@@ -355,8 +354,7 @@ unpack_padding (const GValue *value,
 static void
 pack_padding (GValue             *value,
               GtkStyleProperties *props,
-              GtkStateFlags       state,
-             GtkStylePropertyContext *context)
+              GtkStateFlags       state)
 {
   pack_border (value, props, state,
                "padding-top", "padding-left",
@@ -375,8 +373,7 @@ unpack_margin (const GValue *value,
 static void
 pack_margin (GValue             *value,
              GtkStyleProperties *props,
-             GtkStateFlags       state,
-            GtkStylePropertyContext *context)
+             GtkStateFlags       state)
 {
   pack_border (value, props, state,
                "margin-top", "margin-left",
@@ -412,8 +409,7 @@ unpack_border_radius (const GValue *value,
 static void
 pack_border_radius (GValue             *value,
                     GtkStyleProperties *props,
-                    GtkStateFlags       state,
-                   GtkStylePropertyContext *context)
+                    GtkStateFlags       state)
 {
   GtkCssBorderCornerRadius *top_left;
 
@@ -513,8 +509,7 @@ unpack_font_description (const GValue *value,
 static void
 pack_font_description (GValue             *value,
                        GtkStyleProperties *props,
-                       GtkStateFlags       state,
-                      GtkStylePropertyContext *context)
+                       GtkStateFlags       state)
 {
   PangoFontDescription *description;
   char **families;
@@ -592,8 +587,7 @@ unpack_border_color (const GValue *value,
 static void
 pack_border_color (GValue             *value,
                    GtkStyleProperties *props,
-                   GtkStateFlags       state,
-                  GtkStylePropertyContext *context)
+                   GtkStateFlags       state)
 {
   /* NB: We are a color property, so we have to resolve to a color here.
    * So we just resolve to a color. We pick one and stick to it.

diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h
index 92cfb0761c5edbfa7379b7e9f89715251d5aa75a..3d72facc809511379652886161461438aa970e2f 100644 (file)
--- a/gtk/gtkstylepropertyprivate.h
+++ b/gtk/gtkstylepropertyprivate.h
@@ -43,8 +43,7 @@ typedef GParameter *     (* GtkStyleUnpackFunc)            (const GValue
                                                             guint                  *n_params);
 typedef void             (* GtkStylePackFunc)              (GValue                 *value,
                                                             GtkStyleProperties     *props,
-                                                            GtkStateFlags           state,
-                                                           GtkStylePropertyContext *context);
+                                                            GtkStateFlags           state);
 
 struct _GtkStyleProperty
 {